home *** CD-ROM | disk | FTP | other *** search
/ Linux Cubed Series 3: Developer Tools / Linux Cubed Series 3 - Developer Tools.iso / ptolemy / pt-0.002 / pt-0.6.linux-dynamic-patch1
Text File  |  1996-04-24  |  3KB  |  84 lines
  1. diff -rcd oldpt/ptolemy/mk/config-linux.mk users/ptolemy/mk/config-linux.mk
  2. *** oldpt/ptolemy/mk/config-linux.mk    Thu Apr  4 20:53:46 1996
  3. --- users/ptolemy/mk/config-linux.mk    Thu Apr 25 04:08:50 1996
  4. ***************
  5. *** 93,104 ****
  6.   # linker to use for pigi and interpreter.
  7.   LINKER    = $(CPLUSPLUS)
  8.   
  9.   # Location of GNU libg++ shared libraries
  10.   SHARED_COMPILERDIR =    /usr/lib#$(PTOLEMY)/gnu/$(PTARCH)/lib
  11.   SHARED_COMPILERDIR_FLAG = -L$(SHARED_COMPILERDIR)
  12.   
  13.   # Command to build C++ shared libraries
  14. ! SHARED_LIBRARY_COMMAND = $(CPLUSPLUS) -shared $(SHARED_COMPILERDIR_FLAG) -o
  15.    
  16.   # Command to build C shared libraries
  17.   CSHARED_LIBRARY_COMMAND = $(CC) -shared $(SHARED_COMPILERDIR_FLAG) -o
  18. --- 93,113 ----
  19.   # linker to use for pigi and interpreter.
  20.   LINKER    = $(CPLUSPLUS)
  21.   
  22. + #ifeq ($(USE_SHARED_LIBS),yes)
  23. + # Use Position Independent Code to build shared libraries
  24. + C_SHAREDFLAGS =         -fpic
  25. + CC_SHAREDFLAGS =        -fpic
  26. + # mk/userstars.mk uses these vars
  27. + USER_C_SHAREDFLAGS =    $(C_SHAREDFLAGS)
  28. + USER_CC_SHAREDFLAGS =   $(CC_SHAREDFLAGS)
  29. + LIBSUFFIX =             so
  30. + 
  31.   # Location of GNU libg++ shared libraries
  32.   SHARED_COMPILERDIR =    /usr/lib#$(PTOLEMY)/gnu/$(PTARCH)/lib
  33.   SHARED_COMPILERDIR_FLAG = -L$(SHARED_COMPILERDIR)
  34.   
  35.   # Command to build C++ shared libraries
  36. ! SHARED_LIBRARY_COMMAND = $(CC) -shared $(SHARED_COMPILERDIR_FLAG) -o
  37.    
  38.   # Command to build C shared libraries
  39.   CSHARED_LIBRARY_COMMAND = $(CC) -shared $(SHARED_COMPILERDIR_FLAG) -o
  40. ***************
  41. *** 117,122 ****
  42. --- 126,132 ----
  43.   # be absolute pathnames, not relative pathnames.
  44.   SHARED_LIBRARY_PATH = $(PTOLEMY)/lib.$(PTARCH):$(PTOLEMY)/octtools/lib.$(PTARCH):$(SHARED_COMPILERDIR):$(PTOLEMY)/tcltk/tcl.$(PTARCH)/lib/shared:$(PTOLEMY)/tcltk/tk.$(PTARCH)/lib/shared/:$(PTOLEMY)/tcltk/itcl.$(PTARCH)/lib/shared
  45.   SHARED_LIBRARY_R_LIST = -Wl,-R,$(SHARED_LIBRARY_PATH)
  46. + #endif
  47.   
  48.   # domains/ipus/islang uses BISONFLEXLIBS
  49.   BISONFLEXLIB =    -fl
  50. ***************
  51. *** 139,145 ****
  52.   #    Don't use -m486, it's the default, except for those with the
  53.   #    Pentium optimized compiler; for them -m486 makes things worse.
  54.   #OPTIMIZER =    -g #-m486 -pipe
  55. ! OPTIMIZER =    -O2 #-fomit-frame-pointer #-m486 -pipe
  56.   # -Wsynth is new in g++-2.6.x, however 2.5.x does not support it
  57.   # Under gxx-2.7.0 -Wcast-qual will drown you with warnings from libg++ includes
  58.   WARNINGS =    -Wall -Wcast-align -Wsynth # -Wcast-qual 
  59. --- 149,155 ----
  60.   #    Don't use -m486, it's the default, except for those with the
  61.   #    Pentium optimized compiler; for them -m486 makes things worse.
  62.   #OPTIMIZER =    -g #-m486 -pipe
  63. ! OPTIMIZER =    -O2 -fomit-frame-pointer #-m486 -pipe
  64.   # -Wsynth is new in g++-2.6.x, however 2.5.x does not support it
  65.   # Under gxx-2.7.0 -Wcast-qual will drown you with warnings from libg++ includes
  66.   WARNINGS =    -Wall -Wcast-align -Wsynth # -Wcast-qual 
  67. ***************
  68. *** 165,171 ****
  69.   
  70.   
  71.   # Ask ld to strip symbolic information, otherwise, expect a 32Mb pigiRpc
  72. ! LINKSTRIPFLAGS=-Wl,-S,-x
  73.   
  74.   #LINKFLAGS=-L$(LIBDIR) $(LINKSTRIPFLAGS)# -static
  75.   #LINKFLAGS_D=-L$(LIBDIR) -g -static
  76. --- 175,181 ----
  77.   
  78.   
  79.   # Ask ld to strip symbolic information, otherwise, expect a 32Mb pigiRpc
  80. ! LINKSTRIPFLAGS=-Wl,-s
  81.   
  82.   #LINKFLAGS=-L$(LIBDIR) $(LINKSTRIPFLAGS)# -static
  83.   #LINKFLAGS_D=-L$(LIBDIR) -g -static
  84.